Bug 555386 – format not a string literal and no format arguments

svn path=/trunk/; revision=21642

diff --git a/ChangeLog b/ChangeLog
index e18d38fc12cf14f87d452b0e2d553cff3a1821d4..e6c54662e80afc6fbb18fa22c77ebb5a54e7c2e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-10-13  Christian Persch <chpe@gnome.org>
+
+       Bug 555386 – format not a string literal and no format arguments
+
+       * gtk/gtkiconfactory.c
+       * gtk/gtkprintbackend.c
+       * gtk/gtkprintoperation.c
+       * gtk/gtkthemes.c
+       * gtk/tests/builder.c
+       * modules/other/gail/gailtextview.c
+       * tests/testmerge.c: Use printf safely.
+
 2008-10-13  Christian Persch <chpe@gnome.org>
 
        Bug 555724 – gtkcellrendereraccel not initialised correctly

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index d7818398d614b8e36511005733ab7e9ba59cb4eb..ba90ddd09e2798f01db8cf285f524b60b6bfc715 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -2863,7 +2863,7 @@ icon_source_start_element (GMarkupParseContext *context,
                 error_domain,
                 tmp);
 #else
-    g_warning (tmp);
+    g_warning ("%s", tmp);
 #endif    
     g_free (tmp);
     g_free (stock_id);

diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 1f21aaf8e179440b567ab0fb7eac4b04b4edfd60..2889b94fbaf22ab40324aebc1a2f988341372831 100644 (file)
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -119,7 +119,7 @@ gtk_print_backend_module_load (GTypeModule *module)
   pb_module->library = g_module_open (pb_module->path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
   if (!pb_module->library)
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       return FALSE;
     }
   
@@ -131,7 +131,7 @@ gtk_print_backend_module_load (GTypeModule *module)
       !g_module_symbol (pb_module->library, "pb_module_create", 
                        &createp))
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       g_module_close (pb_module->library);
       
       return FALSE;

diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 321240d82e3e138468b4ed84481abf12b8bc36b4..fad74d3452a4533682e9590d1424f10d5900c6de 100644 (file)
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -1848,10 +1848,10 @@ run_pdf (GtkPrintOperation  *op,
                                      width, height);
   if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
     {
-      g_set_error (&priv->error,
-                  GTK_PRINT_ERROR,
-                  GTK_PRINT_ERROR_GENERAL,
-                  cairo_status_to_string (cairo_surface_status (surface)));
+      g_set_error_literal (&priv->error,
+                           GTK_PRINT_ERROR,
+                           GTK_PRINT_ERROR_GENERAL,
+                           cairo_status_to_string (cairo_surface_status (surface)));
       *do_print = FALSE;
       return GTK_PRINT_OPERATION_RESULT_ERROR;
     }

diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index 919562a56b2cd4c51bae812a3ccd266f1a3086bf..d6d9f7940fab50872b388bdb0eb2fe9cdfd7eafd 100644 (file)
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -81,7 +81,7 @@ gtk_theme_engine_load (GTypeModule *module)
   g_free(engine_path);
   if (!engine->library)
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       return FALSE;
     }
   
@@ -93,7 +93,7 @@ gtk_theme_engine_load (GTypeModule *module)
       !g_module_symbol (engine->library, "theme_create_rc_style", 
                        (gpointer *)&engine->create_rc_style))
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       g_module_close (engine->library);
       
       return FALSE;

diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c
index 35764df34b2065dd5e670b6d0e659d4a5ee40d51..8415666ebc0415e663a0922c372490e20daef684 100644 (file)
--- a/gtk/tests/builder.c
+++ b/gtk/tests/builder.c
@@ -2293,7 +2293,7 @@ test_file (const gchar *filename)
 
   if (!gtk_builder_add_from_file (builder, filename, &error))
     {
-      g_error (error->message);
+      g_error ("%s", error->message);
       g_error_free (error);
       return;
     }

diff --git a/modules/other/gail/gailtextview.c b/modules/other/gail/gailtextview.c
index 4e46f7eaae34a99566102a2eff6f2f2cda6ccb19..499406dfcf53d66ff8e69369af0753709017a0d5 100644 (file)
--- a/modules/other/gail/gailtextview.c
+++ b/modules/other/gail/gailtextview.c
@@ -1733,11 +1733,11 @@ static GIOChannel*       gail_streamable_content_get_stream       (AtkStreamable
            gio = g_io_channel_unix_new (fd);
            g_io_channel_set_encoding (gio, NULL, &err);
            if (!err) g_io_channel_write_chars (gio, (const char *) cbuf, (gssize) len, &written, &err);
-           else g_message (err->message);
+           else g_message ("%s", err->message);
            if (!err) g_io_channel_seek_position (gio, 0, G_SEEK_SET, &err);
-           else g_message (err->message);
+           else g_message ("%s", err->message);
            if (!err) g_io_channel_flush (gio, &err);
-           else g_message (err->message);
+           else g_message ("%s", err->message);
            if (err) {
                g_message ("<error writing to stream [%s]>", tname);
                g_error_free (err);

diff --git a/tests/testmerge.c b/tests/testmerge.c
index 957f5e2fad0359750a8fa5f72f1a1844393da642..125fba5257304d5e0bc9b809fcb90fa480dce0e5 100644 (file)
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -43,7 +43,7 @@ dump_tree (GtkWidget    *button,
   gchar *dump;
 
   dump = gtk_ui_manager_get_ui (merge);
-  g_message (dump);
+  g_message ("%s", dump);
   g_free (dump);
 }